Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Sat, 9 Jan 2010 12:13:15 +0000 (13:13 +0100)
committerJan D. <jan.h.d@swipnet.se>
Sat, 9 Jan 2010 12:13:15 +0000 (13:13 +0100)

Trivial merge